Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds support for negotations #10

Merged
merged 11 commits into from Apr 2, 2013
Merged

Adds support for negotations #10

merged 11 commits into from Apr 2, 2013

Conversation

daf
Copy link
Contributor

@daf daf commented Apr 1, 2013

As outlined in Requesting Roles, Enrolling in Observatory, and Requesting Resource Access

From the UI a user/org manager is now able to:

  • Request observatory enrollment
  • Request a role in an observatory
  • Acquire a resource in an observatory
  • Exclusively acquire a resource in an observatory
  • Invite a user to enroll in an observatory
  • Invite a user to take a role in an observatory
  • Accept/Reject negotiations from the "Open Requests" table in either the Org or User facepages.

Initiating Requests

Most of these actions are initiated from the page dropdown, and get changed out based on current perms/roles (example):

Screen shot 2013-04-01 at 6 21 39 PM

If Request Role is picked, a modal is brought up:

Screen shot 2013-04-01 at 6 23 48 PM

(these vary based on which action is selected)

Accepting/Rejecting Requests

Open/closed requests are presented on the facepages of Org/UserInfo. A user with correct permissions on the correct page may accept or reject a negotiation. Allowable approved items will feature a new column in their data table:

Screen shot 2013-04-01 at 6 14 15 PM

And clicking that row will yield a modal to Accept/Reject:

Screen shot 2013-04-01 at 6 14 23 PM

Dave Foster added 11 commits March 27, 2013 09:39
Adds two optional params to the DataTable view:
- popup_view: A backbone view (should be a modal popup) to instantiate when the added column is clicked
- popup_label: Label to use for the column that indicates a popup
- popup_filter_method: callback to determine if the current passed in row should have the modal behavior.
tboteler-ooi added a commit that referenced this pull request Apr 2, 2013
Adds support for negotations
@tboteler-ooi tboteler-ooi merged commit c422203 into ooici:master Apr 2, 2013
@daf daf deleted the negotiations branch April 2, 2013 13:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants